libostree: Add API to write metadata as stream

And use it in pull-local.  The goal here is to kill users of
ostree_repo_load_variant(), and move a bit more towards hiding the
variants.

diff --git a/doc/ostree-sections.txt b/doc/ostree-sections.txt
index aaecbb486a0b89e5359d21522cff5ec5c0f67db2..428c69f240170ea38c4a83c9d04a958f08d26f41 100644 (file)
--- a/doc/ostree-sections.txt
+++ b/doc/ostree-sections.txt
@@ -76,6 +76,7 @@ ostree_repo_write_metadata
 ostree_repo_write_metadata_async
 ostree_repo_write_metadata_finish
 ostree_repo_write_metadata_trusted
+ostree_repo_write_metadata_stream_trusted
 ostree_repo_write_content
 ostree_repo_write_content_trusted
 ostree_repo_write_content_async

diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
index cba299fa7624e2f7db43d83bdef6b13cd5b73d58..a2bd263bd7df08b2abda073635eae92102ef996b 100644 (file)
--- a/src/libostree/ostree-repo-commit.c
+++ b/src/libostree/ostree-repo-commit.c
@@ -823,6 +823,33 @@ ostree_repo_write_metadata (OstreeRepo         *self,
                        cancellable, error);
 }
 
+/**
+ * ostree_repo_write_metadata_stream_trusted:
+ * @self: Repo
+ * @objtype: Object type
+ * @checksum: Store object with this ASCII SHA256 checksum
+ * @object_input: Metadata object stream
+ * @length: Length, may be 0 for unknown
+ * @cancellable: Cancellable
+ * @error: Error
+ *
+ * Store the metadata object @variant; the provided @checksum is
+ * trusted.
+ */
+gboolean
+ostree_repo_write_metadata_stream_trusted (OstreeRepo        *self,
+                                           OstreeObjectType   objtype,
+                                           const char        *checksum,
+                                           GInputStream      *object_input,
+                                           guint64            length,
+                                           GCancellable      *cancellable,
+                                           GError           **error)
+{
+  /* Ignore provided length for now */
+  return write_object (self, objtype, checksum, object_input, 0, NULL,
+                       cancellable, error);
+}
+
 /**
  * ostree_repo_write_metadata_trusted:
  * @self: Repo

diff --git a/src/libostree/ostree-repo.h b/src/libostree/ostree-repo.h
index 1511b843be45bd606a776cfdaaefdb82bd2caa77..d55874f84cc05b4bf38c08d44637c81f5a231d55 100644 (file)
--- a/src/libostree/ostree-repo.h
+++ b/src/libostree/ostree-repo.h
@@ -169,6 +169,14 @@ gboolean      ostree_repo_write_metadata_trusted (OstreeRepo        *self,
                                                   GCancellable      *cancellable,
                                                   GError           **error);
 
+gboolean      ostree_repo_write_metadata_stream_trusted (OstreeRepo        *self,
+                                                         OstreeObjectType   objtype,
+                                                         const char        *checksum,
+                                                         GInputStream      *object_input,
+                                                         guint64            length,
+                                                         GCancellable      *cancellable,
+                                                         GError           **error);
+
 gboolean      ostree_repo_write_content_trusted (OstreeRepo       *self,
                                                  const char       *checksum,
                                                  GInputStream     *object_input,

diff --git a/src/ostree/ot-builtin-pull-local.c b/src/ostree/ot-builtin-pull-local.c
index 1a0374604278bbbb534a71dd520750e5897ec8f7..f051d6a56f7d41df07f36923b970ba875eda9ada 100644 (file)
--- a/src/ostree/ot-builtin-pull-local.c
+++ b/src/ostree/ot-builtin-pull-local.c
@@ -61,32 +61,26 @@ import_one_object (OtLocalCloneData *data,
                    GError        **error)
 {
   gboolean ret = FALSE;
+  guint64 length;
+  gs_unref_object GInputStream *object = NULL;
+  
+  if (!ostree_repo_load_object_stream (data->src_repo, objtype, checksum,
+                                       &object, &length,
+                                       cancellable, error))
+    goto out;
 
   if (objtype == OSTREE_OBJECT_TYPE_FILE)
     {
-      guint64 length;
-      gs_unref_object GInputStream *file_object = NULL;
-
-      if (!ostree_repo_load_object_stream (data->src_repo, objtype, checksum,
-                                           &file_object, &length,
-                                           cancellable, error))
-        goto out;
-
       if (!ostree_repo_write_content_trusted (data->dest_repo, checksum,
-                                              file_object, length,
+                                              object, length,
                                               cancellable, error))
         goto out;
     }
   else
     {
-      gs_unref_variant GVariant *metadata = NULL;
-
-      if (!ostree_repo_load_variant (data->src_repo, objtype, checksum, &metadata,
-                                     error))
-        goto out;
-
-      if (!ostree_repo_write_metadata_trusted (data->dest_repo, objtype, checksum, metadata,
-                                               cancellable, error))
+      if (!ostree_repo_write_metadata_stream_trusted (data->dest_repo, objtype,
+                                                      checksum, object, length,
+                                                      cancellable, error))
         goto out;
     }